Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Mon, 14 Feb 2011 12:46:45 +0000 (13:46 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Mon, 14 Feb 2011 12:46:45 +0000 (13:46 +0100)

Trivial merge